Merge changes I15f6f5ec,I1be1d442

* changes:
  Update test.sh with changes to file and path names
  Generate separate Android.bp per snapshot variant