Merge "Delete the keymaster@4.1 entry from manifest.xml" into rvc-dev am: bff0190ccd

Change-Id: Ie982dfdd204c1e8913e1d12859c98a00e9dcd855