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