aokp: add Xperia Z, ZL

Change-Id: If5539a97c3aa327c90ecd253968dac8a927c32b5
Signed-off-by: ChampionSwimmer <android@championswimmer.tk>
hercules: update fingerprint to UVMC6

Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>

Change-Id: I252b81574de01370f8387fb1c3eaf85e122097c3
Merge "aokp: add Xperia Z, ZL" into jb-mr1
Merge branch 'jb-mr1' of https://github.com/AOKP/vendor_aokp into jb-mr1

Conflicts:
	products/AndroidProducts.mk
	vendorsetup.sh

Change-Id: I556a6c22902e1e5b46d08fc1c5398a1e8d145a3e