Merge "Move forked vogar classes under vogar.expect" into qt-dev-plus-aosp am: 0798378a85 am: 3b39a1258c
am: a5b96d9c4e

Change-Id: Ib7979792677ec77f8ac4d6597f09c96916354bf7