Merge 'goog/jb-mr1.1-dev' into platform/external/eigen.

Change-Id: Ic9004531328145ea36ba513bb96a23595427f6a4
Merge tag android-4.3.1_r1 into dev-mips-jb-mr2