[automerger skipped] Merge "Rename module lib stubs to 'android'" am: 92aac5c66a am: a3eb43a2ad am: b2c73ad09a -s ours
am skip reason: Change-Id I1ef40b0e426c51d697f1efdabdc87096555e26e8 with SHA-1 1b9cf09e36 is in history

Change-Id: I5cb285f4b38035f184b224287457dbcb5b4a4377