am 04edc344: Merge "DO NOT MERGE remove leanback and recyclerview from javadoc build for d.android.com" into klp-modular-dev

* commit '04edc344a1887465692b49e3eb58e03dccedd675':
  DO NOT MERGE remove leanback and recyclerview from javadoc build for d.android.com
am 263d6660: (-s ours) am 04edc344: Merge "DO NOT MERGE remove leanback and recyclerview from javadoc build for d.android.com" into klp-modular-dev

* commit '263d6660c803110495c0b70ea04afd33f74d39ca':
  DO NOT MERGE remove leanback and recyclerview from javadoc build for d.android.com
am b0c6ea9f: Merge "Invoke debuggerd64 when appropriate with stacks."

* commit 'b0c6ea9f290261c12b6cb127b7bcd53f8ecc2d60':
  Invoke debuggerd64 when appropriate with stacks.
am e49d461a: am b0c6ea9f: Merge "Invoke debuggerd64 when appropriate with stacks."

* commit 'e49d461a8f713e61ad39ba20b48d2b5fee7beafe':
  Invoke debuggerd64 when appropriate with stacks.
am e75101af: am e49d461a: am b0c6ea9f: Merge "Invoke debuggerd64 when appropriate with stacks."

* commit 'e75101afdfc528aed486adbc0170964d1b32a91d':
  Invoke debuggerd64 when appropriate with stacks.
undo the butterbar change, because automerger is ruthless

Change-Id: If9953c9c7af1250a26a74691d8aac58808595c85
DO NOT MERGE
revise butter bar message for clarity

Change-Id: I3672f5537425580758bc40c2c41d8a11ee2d22ee
Merge "build: core: Add nxpsw for AEC function"
Support to add JNI of both archs in multilib build.

Use "LOCAL_MULTILIB := both" to install jni libraries of both archs in
multilib build.
The build system will package jni of both archs to the apk, or install
them to the right location on the system image and create symlinks,
extract .so files from prebuilt apk, etc if appropriate.

Bug: 15849902
Change-Id: I7e147b5a47db476584c38250de7b36c75ea40d81
am 904446ce: am 1a3d260f: am e69d4350: Merge "Support to add JNI of both archs in multilib build."

* commit '904446ce0b3f430ac88ae0c08b9c613721474cd5':
  Support to add JNI of both archs in multilib build.
Merge "Docs: Replacing s.a.c. Android logo to match other sites."
Merge "Support to add JNI of both archs in multilib build."
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build

Bug: 15850610
Change-Id: I46b98adb556d8e6bf166761f8bb240006dbe5b14
Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build"
am 97539b1c: DO NOT MERGE revise butter bar message for clarity

* commit '97539b1c8e70e772b256f574fb95481df901851e':
  DO NOT MERGE revise butter bar message for clarity
am e69d4350: Merge "Support to add JNI of both archs in multilib build."

* commit 'e69d4350cd4af04349b703ba169ba516a96913ba':
  Support to add JNI of both archs in multilib build.
am 1a3d260f: am e69d4350: Merge "Support to add JNI of both archs in multilib build."

* commit '1a3d260f68755b476aa867477fc75d47ef5317bf':
  Support to add JNI of both archs in multilib build.
am bb9ecf42: undo the butterbar change, because automerger is ruthless

* commit 'bb9ecf420f136681a3bd4d5503207733b4dc283b':
  undo the butterbar change, because automerger is ruthless
am e022e9a7: am bb9ecf42: undo the butterbar change, because automerger is ruthless

* commit 'e022e9a7139a55ed8d9fcc9dca3ffdf37727b164':
  undo the butterbar change, because automerger is ruthless
add style for stand-alone back link with left arrow

Change-Id: Ia9219e3e77ef23c6bf6374244c57c4c7e8d1f386