am f43722b7: am 4a5ce9ae: Merge "DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)" into lmp-dev

* commit 'f43722b7733243e79149b19a0635af572c79b3e3':
  DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)