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

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