Added file reorg backward compatibility support by creating wrapper header file. Change-Id: Iee4644c8ae51ba508c21abb765a1e1d974dc6e97