Merge "Stop generating ids in android namespace."