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

Change-Id: I2327b669478fc26672761b511fc99ddece5ca234