Merge "Rename module lib stubs to 'android'" am: 92aac5c66a am: a3eb43a2ad

Change-Id: I4465850b30538481c210a20c41e51f5b280a16e9