Merge branch 'android-L' into cwac
Merge branch 'cwac' into android-L