Revert "DO NOT MERGE Update qt-qpr1-dev with latest code from rv..."

Revert "DO NOT MERGE Update qt-qpr1-dev with latest code from rv..."

Revert submission 10652842-qt-qpr1-drop-10652897

Reason for revert: Broke git_qt-qpr1-dev-plus-aosp

Reverted Changes:
I5ce2eb598:DO NOT MERGE Update qt-qpr1-dev with latest code f...
I3f6abccbc:DO NOT MERGE Update qt-qpr1-dev with latest code f...

Change-Id: I00cd8c91757d26f1924bab447b613628348c0dc1
4 files changed