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

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