Revert Change I067e84bd

… which broke Android Studio: http://ab/4754958

Change-Id: Id8842c0991ef3d7cab30f0cbc7517035545a3a04
82 files changed