Add shamu

Change-Id: If8ba48d60cfe504cba03e01ec8a3c660d4f59da5
Merge "Add shamu" into lollipop