Android S V2 Beta 3
Merge "Fix -Wbitwise-instead-of-logical"