Merge "The base files for the project & activities and XML resources Test: build and run manually Change-Id: I6eb7f1a444703e99f592ac9106261f9c6bd90127"