Fix merge of android-5.0 manifest

Change-Id: I25d733e480d332a98c4d28ee967a8f8be205525e