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

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