shamu: Rebase to CM

Change-Id: Iedd08a74afc86440869f3979b227b39421983630
Find7: Fix variants

Change-Id: I103519114186caee208c94e1b99390c52e90e2ba
find7: Update inheritance order

Change-Id: I07f139f513eb2447c11689bb1be7a528c8a458f7
Merge branch 'lp5.0' of https://github.com/AICP/vendor_aicp into lollipop