Reconcile with jb-mr2-release - do not merge

Change-Id: I237e3ce93b4ac39863d248d54690c71c08721aaf
am 8743d100: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '8743d1005f442d161d22feb0b495e67a2dc2f550':
  WAR for compiler crash on PhaseBeam.
Revert "WAR for compiler crash on PhaseBeam."

This reverts commit 32d40d0d4d4c61782d6cb7bc6f2d18018bd8e17a.
Import translations. DO NOT MERGE

Change-Id: I1de49154cc54e346b0ce95e6958d505f950134d3
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: I062e78914459a83502381670ae6a6d5b2b83ae72
Auto-generated-cl: translation import
Merge tag 'android-4.4_r1' into HEAD

Android 4.4 Release 1.0

Conflicts:
	src/com/android/phasebeam/phasebeam.rs

Change-Id: Ia7ff0ae068447f4243bfdfee85e8e0a171aaf90c