merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I10aa690a24bdda6d980ae5ab4f90ab5fa02ba165
Fix overly strict check for float3 in structures.

We were accidentally being too strict and generating an error for float3
in structures, even when they were not exported. This change restores the
original functionality.

Change-Id: I8f0b5881d670c37a23ca2efc575440a083befcbe
am 68c072cf: Fix overly strict check for float3 in structures.

* commit '68c072cfbb2430b55478350ac74aa5279ae4d9be':
  Fix overly strict check for float3 in structures.
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/frameworks/compile/slang into HEAD

Android 4.2.2 release 1