Fix inheriting props

Change-Id: I468c793fee884fff5391e61deba07bded74e563e
Initial flo dependencies

Using AOSP qualcomm

Change-Id: I5460dba79e72cfeb12ee76b34eea9c75647efcb2
Signed-off-by: Evan Anderson <evan1124@gmail.com>
Merge remote-tracking branch 'PA-flo/kitkat' into kitkat