Fix some make file duplicates

Change-Id: Id226b2cde93cf0f81a6dd33fbdf70f8f954cade8
Update libmincrypttwrp

Change-Id: I90370cd8ef6d9f1be16adba51f51342827a04415
Merge pull request #2 from omnirom/android-5.0

merge into lp5.0