am e2b9af60: am c781405f: Merge "Use standard copyright banner in...
am e2b9af60: am c781405f: Merge "Use standard copyright banner in android/security/keymaster." into mnc-dev
* commit 'e2b9af60':
Use standard copyright banner in android/security/keymaster.