Android 4.1.2 release 2.1
Backport from master.

Change-Id: I416e4325242ba147cb02acb69a577bf1fb60275f
1 file changed