am 378d30b1: Rename RenderScript -> Renderscript.

* commit '378d30b1da622e0e75e551e95fafb18ff3a3f88e':
  Rename RenderScript -> Renderscript.
am 1dae01a3: Reconcile with jb-mr1-release

* commit '1dae01a3429f276f12650d09deb24e2b123be64a':
am 6f624756: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '6f62475650e707c95eb8b31896d1a46cb389aae6':
am 6ca612f3: am abd6d049: Don\'t cap max-threads to current cpu count.

* commit '6ca612f39c79b4ee37d52d498193a8c503fca108':
  Don't cap max-threads to current cpu count.
am 20f164e8: am da3b58d8: Fix build. New clang has stricter checking.

* commit '20f164e86531949de73c0ef5e2bd706f0519d5bb':
  Fix build. New clang has stricter checking.
am cbfa8e9e: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'cbfa8e9e0aaa002efaab4fa67cdca04c96169263':
am 4df4c329: am 65723fe0: Add initial approximate function prototypes and cleanup rs_cl.rsh

* commit '4df4c3296c35c722c9e0c7eb3483beecb53903ac':
  Add initial approximate function prototypes and cleanup rs_cl.rsh
am 67ae42b5: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '67ae42b5eec1c8fc8182a9b3b631e2991bb23714':
am 12ab463a: am c3b8f060: am 72f3ad8f: Merge "fract() uses a float*, not an int*."

* commit '12ab463aaac32bab79fcbb2671e7f1210053925c':
  fract() uses a float*, not an int*.
am 58fca468: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '58fca468950eb1ab847fd43e6bc5a876505eb052':
am 7e0dd368: am 8eaba4fe: Intrinisics

* commit '7e0dd36881c2b2d872b43536a96d12141e575c44':
  Intrinisics
am 84b503d1: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '84b503d13457d52a25767243de6783d7f8da38d0':
am 2d890c79: am 7150c93a: Add approx_atan and header guards to rs_cl.rsh

* commit '2d890c794289bc4eb2bffd4a96688c841db31288':
  Add approx_atan and header guards to rs_cl.rsh
am dac71b6d: am ff59947f: Merge "Fix stale realloc pointers." into jb-mr1-dev

* commit 'dac71b6d51119fe7e44a3f0a996b9cd9c77cb108':
  Fix stale realloc pointers.
am 6eef580b: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '6eef580bcb15220495412691d4ae564d22a469a7':
  Fix stale realloc pointers.
am 87d9ae41: am 41d6c769: Clean up useless code, logging, and a typo.

* commit '87d9ae4154f91efff0256d383639ade352fcbd2a':
  Clean up useless code, logging, and a typo.
am 311db201: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '311db201d57f53efdad5b0b3be5fded3b797c2e9':
am c6766514: (-s ours) am d7a5dd9c: am 7c220b78: (-s ours) am 10bbadf3: (-s ours) am 1a1b0f9e: (-s ours) Merge "DO NOT MERGE - Plumb context through for serialization."

* commit 'c6766514004d2a0eef7b664bfd0442d064ce98c0':
  DO NOT MERGE - Plumb context through for serialization.
am 72e0a359: (-s ours) am 581097c6: am f4236fa4: (-s ours) am 73018ee9: (-s ours) am 7e070a1f: (-s ours) Merge "DO NOT MERGE - Move memory layout to driver."

* commit '72e0a359e66ea2970eaabe5351a4091713dd2e79':
  DO NOT MERGE - Move memory layout to driver.
am 30d3a95f: (-s ours) am 188232d7: am 4d0cb4c0: (-s ours) am 2ca2b9fb: (-s ours) am 417d6589: (-s ours) Merge "DO NOT MERGE - Cleanup pointer access in adapter and font."

* commit '30d3a95f9db2b826743ce187cdc4b1188c81bdff':
  DO NOT MERGE - Cleanup pointer access in adapter and font.