Merge "Rename module lib stubs to 'android'"