merge in master-release history after reset to master
"AAR58"
am 95940790: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '95940790ad7160cfc9d497a9fe49446970f90056':
  "JWR58"
  "JWR57"
  "JWR56"
merge in master-release history after reset to master
"AAR59"
Reconcile with jb-mr2-release - do not merge

Change-Id: Ic2bedc28934c86a1d84c86ef081abba066b9f1e7
am 34949064: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '349490646f72d63eb88fcb806a96248b4146d319':
  "JWR59"
  JWR58C
  JWR58B
am 9016d0ae: Merge "Fix signing process for SELinux file_contexts" into jb-mr2-dev

* commit '9016d0aef415e00df636b6407a05e5e08e430ed8':
  Fix signing process for SELinux file_contexts
am a422266b: am 9016d0ae: Merge "Fix signing process for SELinux file_contexts" into jb-mr2-dev

* commit 'a422266b1c66e9fa37fbfcf22f273aaa99f16f00':
  Fix signing process for SELinux file_contexts
Reconcile with jb-mr2-release - do not merge

Change-Id: Iaf7449c8a3d44b7d692291a65c03ec59c2d2aedb
Tweak proguard flags in the 2 files.

So all most commonly-used flags go to proguard_basic_keeps.flags
and they will still be applied when LOCAL_PROGUARD_ENABLED=nosystem.
Bug: 9203442

Change-Id: If018076dc625ac1efe31898b179dbba850218aaf
am 1dd9f19e: Merge "add renderscript to support library javadocs" into jb-mr2-dev

* commit '1dd9f19e8f020e691f08361668a1132181c267c5':
  add renderscript to support library javadocs
am 041fd816: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '041fd81699448ff4fbcabeebe15bb7dedade9dfb':
  "JWR60"
  JWR59C
  JWR59B
am 6c380fe5: am 1dd9f19e: Merge "add renderscript to support library javadocs" into jb-mr2-dev

* commit '6c380fe5da492c526f81c894a069e63ab62613de':
  add renderscript to support library javadocs
AAR59B
Merge "Tweak proguard flags in the 2 files."
AAR59C
merge in master-release history after reset to master
"AAR64"
improve OTA failure messages

Replace OTA script constructs of the form:

   assert(foo);

with

   foo || abort("sensible message");

so that the log and the on-screen display is somewhat more accessible
to non-experts.  (assert() displays the source code of the false
expression 'foo'.)

Change-Id: Ic99448e4466561d305b167cd4d5c1f0f2dbadcce