Merge "Framework: Lock inversion checker" am: 33ee4a5536
am: a2415fbb01

Change-Id: I73e1861532857e0a4fb724e7969ccea32205410e