Fix grammar error in roomservice; Only add xml files in local_manifests

Change-Id: Ia132acddd2761ec4c1bea7fb510e3bea306ea9fc
build: Fix PreBuilt Chromium refs

Change-Id: Icc553d5be1e71d8c754bc85b6906252e5690b508
Merge remote-tracking branch 'omni/android-5.0' into android-5.0