[n7000] n7000 fixup

Change-Id: I8d89a314a653cf06797b4ebc2c581667238616bf
[p3110] p3110 fixup

Change-Id: I324d1d2b761261484149c6c12f9e3be9c63f1c4a
Merge pull request #27 from locusf/hybris-10.1

[n7000] Fixups for n7000 and p3110.