* commit '939f4bfd9e48ca6df77652c5cb02374e4e8c6a8d': DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)
Adding a new folder in development/samples is not enough to have it be packaged with the SDK. Make sure to edit development/build/sdk.atree to add the sample to the SDK build.