Merge "Fix a warning in generating id in android namespace."
am: ec561963ec

Change-Id: I5c8e441a44996c2eb7c423c9de8fc9a7b89cd9bc